Merge "[ActivityManager] Prevent application holding AMS lock"
automerge: 53e8d6f

* commit '53e8d6f934be403b9c7733c190b6052d60dd0658':
  [ActivityManager] Prevent application holding AMS lock