Merge "Snap for 8369264 from 9bfcb851c99aca018ef8a97b410ee8610a376ea5 to androidx-media-release" into androidx-media-release