resolve merge conflicts of 70adfe3 to nyc-dev
resolve merge conflicts of 70adfe3 to nyc-dev

Change-Id: I0dbd35b74a8cc1427258b4066d759a6861faba8f

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