Merge "Add new framework-photopicker inside MediaProvider module" into main am: 0c6b2f2722

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

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