Merge "Snap for 8486937 from 9bfcb851c99aca018ef8a97b410ee8610a376ea5 to androidx-camera-release" into androidx-camera-release