Merge "Power:Update android.hardware.power AIDL interface" into power.lnx.6.0