Merge "Snap for 6994331 from 15a16b348d8551907d1b8a9962ac1a7a927c4a13 to androidx-master-release" into androidx-master-release