Merge "Snap for 12359238 from 32f1419eca0df61e6413af96d350107c80beca67 to android15-tests-release" into android15-tests-release