Snap for 11637835 from 7bc2c8ccf1db5bd95d471f52ecfe732b5722ff61 to androidx-main-release

Change-Id: I3d8a2c5038526801f25034ff5676b1184bd5eb56