Merge "Snap for 13670698 from b8fe25a9448a19de92a5ad472383426d1550642f to android15-tests-release" into android15-tests-release