Merge \\\\"Fix deadlock b/w ActivityManagerService and MediaSessionService\\\\" am: 4eea3a7f88 am: 42927c4e94 am: b91869d35f
am: ccb59c489a

Change-Id: I88960a574fb0a5b2a2db5e0cb3e8d4eb836463cd