Merge "Revert "Enable Photo Picker to be launched via ACTION_GET_CONTENT"" into sc-mainline-prod am: 8afdd90256

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

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