Merge "DO NOT MERGE: Fix deadlock in AcitivityManagerService." into mnc-dev am: 38077274d0 am: 96d70301e6 am: 018d1e7e1e am: fc2bef0139  -s ours am: 011172a731
am: 543828d06f

Change-Id: I2aa28a08f0cd4799e0f1969c93b9a8a0502e51e0