Merge "Add flag android.app.skip_ref_content_provider to trunk_staging." into main