resolved conflicts for merge of 816cff12 to master
resolved conflicts for merge of 816cff12 to master

Change-Id: I33990232771138dcf91f55c7cde6bbfe40612b8f

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