[automerger skipped] Merge "Merge SP1A.211105.004 to aosp-master - DO NOT MERGE" am: 55abedd4cb -s ours

am skip reason: Merged-In I84791c1e06acacf53178eb40899b5f8f025f4b5b with SHA-1 8c64cef2b1 is already in history

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

Change-Id: Ieb8702f5a84ccc219f2e5943eeb4f61e7c16537a