resolved conflicts for merge of 1c92912b to lmp-dev-plus-aosp
resolved conflicts for merge of 1c92912b to lmp-dev-plus-aosp

Change-Id: I5a57218e81dff86f46af7067d47f7af816e2d12c

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