Merge "Snap for 13958310 from 50738a06c2e18414eb8c456ea4e29673b997442b to androidx-graphics-shapes-release" into androidx-graphics-shapes-release