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

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

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