Merge "DO NOT MERGE: Fix deadlock in AcitivityManagerService." into klp-dev am: d1e3e53d79 am: a4c9bbefdf
am: 3fca892d3e  -s ours

Change-Id: I4d66089c6ec8743f119dd4aab641b22ebdad7b5c