[automerger skipped] Merge "Enable remote preview by default in photo picker" into tm-dev am: d5276fa4c7 -s ours

am skip reason: Merged-In Ibbcc21f22b8e3ead1b5b38160fec89219730cb72 with SHA-1 3c7e89491b is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/providers/MediaProvider/+/17418599

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