Merge changes from topic "ExoPlayer_in_MP" into sc-mainline-prod am: 4a9f7e7ac1

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

Change-Id: Id0049662a0db2ed26440b5a63429a8895207e054