[automerger skipped] DO NOT MERGE - scrollable image preview to teamfood am: f23a43b878 am: db3409c7cb -s ours

am skip reason: subject contains skip directive

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

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