Merge "Snap for 11414347 from d65d52044040bf180ef372b9e9348a7c19acb15d to androidx-graphics-release" into androidx-graphics-release