DO NOT MERGE: Fix deadlock in AcitivityManagerService. am: dce4be63bb am: a437e7f3f1
am: c1b2e6db98  -s ours

Change-Id: I006233ce7258467da7d5c09c9925bd6048d85ed3