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