Merge "Snap for 12074773 from 98754efc27ec04136199b2e737243e1e9efd5ac1 to androidx-graphics-shapes-release" into androidx-graphics-shapes-release