Merge "Fix deadlock b/w ActivityManagerService and MediaSessionService"