resolved conflicts for merge of f6be5a7a to master
resolved conflicts for merge of f6be5a7a to master

Change-Id: I6dcfb33981df90877fb9f3752b853cf377633edf

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