resolved conflicts for merge of cbf26fd3 to master
resolved conflicts for merge of cbf26fd3 to master

Change-Id: I1feb7266c1d5cdebbfb8b8fa0d87d986953a20b6

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