resolved conflicts for merge of d6288751 to master
resolved conflicts for merge of d6288751 to master

Change-Id: Ibfe5be04e093253c36c47149870273ae3ab860c0

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