[automerger skipped] Remove the code flow that is applicable to apps with higher target sdk am: 31468618ff -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/+/16904910

Change-Id: I419ef93934ae5d22ba1f361f95bcf6d4813a193d