Merge "Correct PowerManager transaction IDs. These transaction IDs must be kept in sync with the method order from IPowerManager.aidl." am: 02e24f6424 am: 278cee2886 am: d74d450377 am: eaefd4d860

Change-Id: Ic38f568276cf23a5febac47959e9914fa4beef04