Merge "Snap for 12359238 from 75a0af5dcdf735c52ccc0a75cc24c7baca4edb1e to android15-tests-release" into android15-tests-release