DO NOT MERGE: Fix deadlock in AcitivityManagerService. am: 2d608378f4  -s ours
am: bab9c1006a

Change-Id: Iab381b1ab450997c5835b68e8dc25e14d8ee34f1