[automerger skipped] Merge "Remove MediaProvider @TestApi" am: f2abe4aec0 am: f61012ace4 am: 1eb0f58768 am: 59d131a5c0 -s ours

am skip reason: Change-Id Icd99f09f15ebf386adc20b32ea25dc3ba221aab8 with SHA-1 6b3a079be7 is in history

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

Change-Id: I0e5a5ff4f9dfa005f8eeb5936742fae319e9b017