Merge "Fixed SystemServiceRegistry to return a null AppPredictionManager when the service is not defined."