DO NOT MERGE: Fix deadlock in AcitivityManagerService. am: dce4be63bb am: a437e7f3f1 am: c1b2e6db98  -s ours am: ff9a8d74c7  -s ours am: 51bcb058ad am: c6d9bdded2 am: 1b0debac62  -s ours am: 1310d53aea
am: 71bb55afd9

Change-Id: Id9ccdcb6bad4eddb355f2035049361c66a3a5f15