Merge "Sanitize inputs for PreferredSimFallbackProvider.query()"