DO NOT MERGE: Fix deadlock in AcitivityManagerService. am: dce4be63 am:...

DO NOT MERGE: Fix deadlock in AcitivityManagerService. am: dce4be63 am: a437e7f3 am: c1b2e6db  -s ours am: ff9a8d74  -s ours am: 51bcb058 am: c6d9bdde am: 1b0debac  -s ours am: 1310d53a am: 71bb55af am: 62c6ce4c am: 5753af88  -s ours am: 4c77b604 am: a5606274 am: 03d90791
am: 920d8cc8

Change-Id: Ifcbbadd8b4505bc3992aedc3df75d44aa410398f