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