Merge \\\\"Resolve deadlock between ActivityManagerService and PowerManagerService\\\\" am: 06561db207 am: 2c565826ba am: 26a0b16da8
am: 43e8af64c2

Change-Id: I9c261e2c4223069f8cfa8d16a5e96babc4522af0