Merge "Work on issue #28200735: AcitvityManagerService lock held for..." into...
Merge "Work on issue #28200735: AcitvityManagerService lock held for..." into nyc-dev am: e76ffd19
am: 95f1eb67
* commit '95f1eb67':
Work on issue #28200735: AcitvityManagerService lock held for...
Change-Id: I3f19397c93d9ab15716ae098986f46540643177c