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