Merge "Snap for 15130004 from f06620241d81f1564d4a87a9bf51cf81978cc515 to android15-tests-release" into android15-tests-release