DO NOT MERGE: Fix deadlock in AcitivityManagerService. am: dce4be63 am: a437e7f3 am: c1b2e6db  -s ours am: ff9a8d74  -s ours am: 51bcb058 am: c6d9bdde am: 1b0debac  -s ours am: 1310d53a am: 71bb55af am: 62c6ce4c am: 5753af88  -s ours am: 4c77b604 am: b5a0a8ab
am: cd1d6b22  -s ours

Change-Id: I9ae50191d3f0fdfe8188e2a02597cf506bea36bd