DO NOT MERGE: Fix deadlock in AcitivityManagerService. am: b59e73613b am: 2f44f906a6 am: f4844b3416 am: 6f170618ff -s ours
am: 7f99a18e0e
Change-Id: I76fbf0ec1ded360147f280ce241b1d5751eb09db
This commit is contained in: