Snap for 6860046 from 3da604b8524188eb6965fc43d22d6b4bfd7bd6b3 to androidx-master-release

Change-Id: I941c8df21fea474bb272aaa0ad6fcb0b44d68852