Merge "Update mocks to fix AccountManagerServiceTest." into main