Merge "Snap for 14523826 from 4c5ccb52d2aa68cf05c160f3a02c4ab7eaf1af7b to android15-tests-release" into android15-tests-release