Merge "DO NOT MERGE: Fix deadlock in AcitivityManagerService." into lmp-mr1-dev
am: 900550de49

Change-Id: I16a545056d2fc3404164a1b63ef79165f46e54f1