Merge "Remove MediaProvider @TestApi" am: f2abe4aec0 am: f61012ace4 am: 1eb0f58768

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

Change-Id: Ibb2057f2343938a0ef8cc542117fa9daaf9c453f