Merge "Snap for 11840744 from fd432cf1480a329ccd822d72cc36993a949569cb to androidx-graphics-core-release" into androidx-graphics-core-release