Merge "Power: PowerHAL AIDL interface" am: 384eb8a2bb am: fd7e72f323

Change-Id: I5fc60d5adb92462ab81583ad97e21f1338e618a8