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