Merge "Snap for 15908066 from 9054ba6b344f05cc6e4f8ab818aff71ac3a02d4b to android15-tests-release" into android15-tests-release