resolved conflicts for merge of 5d146549 to master
resolved conflicts for merge of 5d146549 to master

Change-Id: I96c720b9afd4a28d27ed00020551f791e8aefa2b

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