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