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

Change-Id: I854127259e85afb06046253c2d767f12439ae819