[automerger skipped] Merge "Add READ_MEDIA_VISUAL_USER_SELECTED permission and...

[automerger skipped] Merge "Add READ_MEDIA_VISUAL_USER_SELECTED permission and appop" into tm-mainline-prod am: 929b30e2 -s ours

am skip reason: Merged-In I4dadcad364d0a646619e50165c06d5b4be6d6726 with SHA-1 2b90ab41 is already in history

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



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