Merge "Snap for 15524441 from ae12bdfb2ab95c058d1861c777ba849f4a020837 to android15-tests-release" into android15-tests-release