DO NOT MERGE: Fix deadlock in AcitivityManagerService. am: dce4be63bb
am: a437e7f3f1

Change-Id: I13fdcfc2ecca2e5e1d178d61ef8ec6990a0fc3af