[automerger skipped] 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 am: 9c78ee2f9e -s ours

am skip reason: Change-Id I3123a8803c334f7e82fe6da3df0202eb56786b1c with SHA-1 11857fbeff is in history

Change-Id: Ic68c075acd7b09a36e40d8afbcdfa2c4438e1083