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