resolved conflicts for merge of 850cdbe5 to lmp-mr1-dev-plus-aosp
resolved conflicts for merge of 850cdbe5 to lmp-mr1-dev-plus-aosp

Change-Id: Icb394ddc92eb64732993ef345284e63c9844f76b

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