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

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

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