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