resolved conflicts for merge of a81ee86b to master
resolved conflicts for merge of a81ee86b to master

Change-Id: I7be3a64261d2405eda55b43c02b47657f393c095

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