[automerger skipped] Merge "DO NOT MERGE - scrollable image preview to teamfood" into tm-qpr-dev am: 5c5d622d8b am: 23926e88c2 -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: I64087bba866ed1339db20b1b4246422a33b2a5fb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>