Merge "Snap for 12359238 from 11b8378fe9a1afe21c1971d50c22c78ee50675bf to android15-tests-release" into android15-tests-release