Merge "Fix flakiness in AppPredictionServiceTest due to async."