[automerger skipped] Fix ANR in MediaProvider during database migration am: 7580349bd7 -s ours

am skip reason: Change-Id I9ea073d4c82301d39ffabb1b3829cc943d495284 with SHA-1 7ed93b38b5 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I173c1f6deab9ce614b90349f092a2153086ed17a