resolved conflicts for merge of d7d47941 to master
resolved conflicts for merge of d7d47941 to master

Change-Id: I4ec47b9461c5ba350adfc257bc1820ee079b751e

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