Merge "DO NOT MERGE: Fix deadlock in AcitivityManagerService." into lmp-dev am: b358ee3558 -s ours
am: 43a1f74d7f
Change-Id: I541e01b2d5d76a49908bd3c1557de9ba84a2cc3d
This commit is contained in: