Merge "Snap for 9009571 from ec7b85d5c1404c450aeb765b9715a210ee9fe65a to android13-tests-release" into android13-tests-release