Merge "Remove powerHint from IPowerManager.aidl"