Merge "Remove MediaProvider @TestApi" into mainline-prod