Merge "Revert removal of power hint from PowerManager.aidl"