resolved conflicts for merge of 20afae51 to master
resolved conflicts for merge of 20afae51 to master

Change-Id: Ief637e412e4d716526de68c7761bdb8cbf436333

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