resolved conflicts for merge of 9483748a to stage-aosp-master
resolved conflicts for merge of 9483748a to stage-aosp-master

Change-Id: I82fd3a6ddeffc564915e43b23b81293adf1f9b5d

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