Merge "Merge cherrypicks of ['android-review.googlesource.com/2586750'] into androidx-camera-release." into androidx-camera-release