Snap for 11637835 from ac03ac9aec94f76e52e24b2f65ec6948737b94dd to androidx-main-release

Change-Id: Ibd698b7f50d6b881893c8ffeac451e75998b8632