Merge "Add updateable fields to EXTRA_CHOOSER_ADDITIONAL_CONTENT_URI definition" into main