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

Change-Id: I95bfe3e8ae3508f5c4696165320738e896a90405