[automerger skipped] Remove the code flow that is applicable to apps with higher target sdk am: 20623a18c3 -s ours am: cb257474b0 -s ours am: 12a007a35f -s ours

am skip reason: Merged-In I52481b24b137790d49845f1a4b00978c63ed183b with SHA-1 098e5ab1fd is already in history

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

Change-Id: Ifd732672fd264ca3faa06787a8b7457432112941