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
am: 220d470e
* commit '220d470e':
Work on issue #28200735: AcitvityManagerService lock held for...
Change-Id: I3cd3df68fb54a5d2818951bd25ff8afb1fbd7bb8