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

Change-Id: Ic0fcc32f4afbc13635313c7d64bb5f882dd31665