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