Merge "Switch EXTRA_MODIFY_SHARE from PendingIntent to ChooserAction" into udc-dev