Merge "Snap for 16433255 from cdbb0cb8d4be546bd0499841087949333a104cc8 to androidx-camera-release" into androidx-camera-release