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

Change-Id: I0e350af935331a565cde5949d85845ea8fc16396