[automerger skipped] Merge ab/7061308 into stage. am: 830ca8dc50 -s ours

am skip reason: Change-Id If4d171d9eef3f94e6dc6c9a832dcaffc2dae4ba1 with SHA-1 20ee550837 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9cad0a0f39e46582ebb422653da744df92ef2eba