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

Change-Id: I499c69fd3890ada652213c0510df3b884223a5df