Snap for 7024209 from 4a4737a1cfd34830614e2ed9c0e77245f024ae6b to androidx-master-release

Change-Id: Ied645161ed6f182e9c980977044a6446d5d4c7f2