Merge "[ActivityManager] Prevent application holding AMS lock"