Merge "Fix A11y not selected issue in PhotoPicker" into sc-mainline-prod am: 3d105c1e7c

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

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