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

Change-Id: I7ff533b33ef48ffe82954937eb68a212e17001c0