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

Change-Id: Ic7c49f085dd8f74cf54b774637c21359e381a455