Merge "Correct PowerManager transaction IDs. These transaction IDs must be...
Merge "Correct PowerManager transaction IDs. These transaction IDs must be kept in sync with the method order from IPowerManager.aidl." am: 02e24f64 am: 278cee28
Change-Id: Ia42a6d945e64fef11d41949961c493eb8dd52e69