Merge "Remove MediaProvider @TestApi" am: f2abe4aec0

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

Change-Id: I010c019b17b80d4f3a65aceedfd530ddbfbd2952