Merge "DO NOT MERGE: Fix deadlock in AcitivityManagerService." into lmp-mr1-dev am: 900550de am: 94da8023 am: 426ba52b  -s ours am: 1781d2bd am: f428d49b am: 21d4b845 am: 94b739d3  -s ours am: 3f8c9746 am: 2cc87e32 am: c8e6a937 am: 99499e52
am: eba8de63  -s ours

Change-Id: I226d04f9e5d0603023834e99685223f7a8542849