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

Change-Id: I09f4adbeb7fb885a73e437a9b69eea30317396d2