resolved conflicts for merge of c00d2ddc to master
resolved conflicts for merge of c00d2ddc to master

Change-Id: I075cc5b5df2909152ee463f8a0c7534344b47c62

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