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