Merge "Work on issue #28200735: AcitvityManagerService lock held for..." into nyc-dev