Fix merge error
Fix merge error

Change-Id: Iec72332a45b094deaccd4e188658770aee8a61b4

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