Merge "Fix deadlock in AcitivityManagerService." into nyc-dev am: e70ebd69 am: 91064a0e am: 729759f8 am: dedfa06a Change-Id: I0e350af935331a565cde5949d85845ea8fc16396