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

Change-Id: I360338620a6607d882ac8dd13ec9cfbfc8381762