Merge "MockContentResolver: add logging for missing providers" into main