resolved conflicts for merge of fa2e53cc to master
resolved conflicts for merge of fa2e53cc to master

Change-Id: Idc54765c28ab7c6c810095aba1ba21d7695e08d5

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