Merge "Snap for 13836320 from e4471f77763d6e24e9ef5c2d300095efe322a25d to android15-tests-release" into android15-tests-release