[automerger skipped] Merge "Add shareseet scrollable image preview flag" into...

[automerger skipped] Merge "Add shareseet scrollable image preview flag" into tm-qpr-dev am: 0e76981c am: 882dd947 -s ours

am skip reason: Merged-In I388c51305e1bc4a06fe44ed17c8c8c979fbe6942 with SHA-1 e6198c2f is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21159013



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