Merge "Snap for 12296315 from 4b41315203fb2ddd84ff2836d474c05729929a0b to androidx-startup-release" into androidx-startup-release