resolve merge conflicts of 94ab88228e to master.
resolve merge conflicts of 94ab88228e to master.

Bug: 26178938
Change-Id: I1ec3421f4bb501942a0c06032d56cdaf06f56b45

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