Merge "DO NOT MERGE - scrollable image preview to teamfood" into tm-qpr-dev am: 5c5d622d8b

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

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