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