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

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

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