Merge "Resolve deadlock between ActivityManagerService and PowerManagerService"