Merge "plurals cleanup in android/packages/providers/MediaProvider" into sc-mainline-prod