Revert "Follow up for change 18b4cbeedef21c1fa666a110a157b."
Revert "Follow up for change 18b4cbeedef21c1fa666a110a157b."

This reverts commit c5b281c981d7290e3615d105cf2e23afc32c304d.

Change-Id: Id36f463e73068e14bc8fac0a289180be078ffbf9

xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base