Merge "Update EXTRA_CHOOSER_MODIFY_SHARE_ACTION to use ChooserAction" into udc-dev