Merge "Fix deadlock in AcitivityManagerService." into nyc-dev am: e70ebd694b am: 91064a0ed3 am: 729759f8c9 am: dedfa06a62
am: a63b4a4844

Change-Id: I192eaa0e63ffe0f403178c9e87ff53edd1b06db5