Merge "Snap for 9981179 from c87deb1d765c9854cb086ffa48d2b581a0ece4ef to android13-tests-release" into android13-tests-release