[automerger skipped] Merge "Add new framework-photopicker inside MediaProvider...

[automerger skipped] Merge "Add new framework-photopicker inside MediaProvider module" into main am: 69bb727e am: 8060c44c -s ours

am skip reason: Merged-In Ic29a1097bf73657973174769973e50e7dd985cc6 with SHA-1 d7fb4d6f is already in history

Original change: https://android-review.googlesource.com/c/platform/build/+/3256761



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