Snap for 7482086 from 1d3db4f3e9eafe2615387a84642f74da4e1d39f2 to androidx-startup-release

Change-Id: Id89a3adf1946e820e440c3a61346224bcbedfd36