Merge "DO NOT MERGE: Fix deadlock in AcitivityManagerService." into klp-dev am: d1e3e53d79 am: a4c9bbefdf am: 3fca892d3e -s ours am: 1d053b3be8 -s ours
am: af97c8805f
Change-Id: I7e65b0aae28bf10f3c84882990f9c26132709420
This commit is contained in: