Merge "Add an extra to sharesheet's image edit intent" into udc-dev am: c37ca40345 am: ab04cd8f31

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/IntentResolver/+/23725969

Change-Id: I50f3a9e52795115bd6720904bb0a26133082a279
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>