Merge changes from topics "enable_get_content", "presubmit-am-bb6bdeffbe264443beaa80847af446d3" into sc-mainline-prod am: 888e1124d8

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

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