Merge "Snap for 6922857 from de06abce44693daffd1b49b34aaff186932f98c4 to androidx-master-release" into androidx-master-release