Merge "Merge cherrypicks of [1330950, 1333491] into androidx-customview-release" into androidx-customview-release