Merge "Snap for 11419326 from f0bd5cf416304cd6c8fddbeb71fdb531725ebf1e to androidx-g3-release" into androidx-g3-release