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

Change-Id: I70b73f8783c338a9b98a70c23f354352606adc14