Merge "Snap for 12143365 from 601871c3671dcfaaa46c102e389f7200da46982d to androidx-camera-release" into androidx-camera-release