Merge "Merge cherrypicks of ['android-review.googlesource.com/3800026'] into androidx-graphics-shapes-release." into androidx-graphics-shapes-release