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

Change-Id: Ieb503007f420f06c599b8fc9f4703954885754b0