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 am: d74d4503 am: eaefd4d8
Change-Id: Ic38f568276cf23a5febac47959e9914fa4beef04