Merge SP1A.211205.008 am: 9b38a86cdd

Original change: https://android-review.googlesource.com/c/platform/prebuilts/module_sdk/MediaProvider/+/1930673

Change-Id: I6ce4becd46ca3e013e53d0005f1d162f085c7a36