Merge "Fix flaky ActivityManagerServiceTest."