Snap for 11116265 from 58c35e83c9694fddff4c4f9b1e2ee52e8030e02e to androidx-startup-release

Change-Id: Ic669359cfa7d782cc6b24964e445c651e5e5b05e