Snap for 6922857 from de06abce44693daffd1b49b34aaff186932f98c4 to androidx-master-release

Change-Id: I856bdfdd6e54d68cc576d731c2d22db032e0c223