Merge "Snap for 14875195 from b29c45b4e79b68696cb839b2e1be380d9bb04f9e to androidx-camera-release" into androidx-camera-release