Merge "Make ContentSuggestionsManager and AppPredictionsManager tests pass" into android10-tests-dev