resolved conflicts for merge of 132004f8 to master
resolved conflicts for merge of 132004f8 to master

Change-Id: I35c6ef810daf2b1329c46798fe6c7e6f2c1dfc82

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