automerge: 6112f63 * commit '6112f63369c7ba463c0384c73a4e4c0d45b63918': [ActivityManager] Prevent application holding AMS lock
automerge: 6112f63 * commit '6112f63369c7ba463c0384c73a4e4c0d45b63918': [ActivityManager] Prevent application holding AMS lock