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

Change-Id: Ibcf2a2f7c60581cdad61847e05e22c44e7e636dc