resolve merge conflicts of 9ea5295597 to master.
resolve merge conflicts of 9ea5295597 to master.

Change-Id: I68b883e8a1bb17abd4cf151d057dd07e53a80f50

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