Merge \\\"Resolve deadlock between ActivityManagerService and PowerManagerService\\\" am: 06561db2 am: 2c565826 am: 26a0b16d Change-Id: Ib90892556fde2bf8c53a7074b5d2702059adff65