Merge "DO NOT MERGE: Fix deadlock in AcitivityManagerService." into klp-dev
am: d1e3e53d79

Change-Id: Id794cb9cd3792317d2786671f2f84a6ad8bbd404