Snap for 5946345 from 6542df0fa5f281b48fae9c3fdb4d40e11df5c156 to androidx-master-release

Change-Id: Iab5fdfafd037ce3ca3b8aff01e7baf84ff7d831d