Merge "DO NOT MERGE: Fix deadlock in AcitivityManagerService." into lmp-mr1-dev am: 900550de49 am: 94da8023d5 am: 426ba52b42  -s ours am: 1781d2bd3b
am: f428d49b12

Change-Id: I268ea392d2ebabb0ed5d3d74c02c1340d6067531