Merge SP1A.211205.008 am: 9b38a86cdd

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

Change-Id: I6ce4becd46ca3e013e53d0005f1d162f085c7a36
tree: e15991000c90a64a19e13f4a3755501c4d491a02
  1. .prebuilt_info/
  2. 1/
  3. current/
  4. OWNERS