[automerger skipped] Merge "Fix migration bug" into mainline-prod am: c76cbca505 -s ours am: ff03dbc180 -s ours

am skip reason: Change-Id Idfe3715d63ab3089052bc8c7d06428ce62268731 with SHA-1 c5141487ec is in history

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

Change-Id: Ia4325b9d0911090db70db67fee5e18a8f9eabf4d