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

Change-Id: Ic622fadd075915e1ba78d6795bc9382d0c6bd131