Merge "Snap for 12047151 from aa06950cc457e356949cc0f2cdf97041639dfe9c to android13-tests-release" into android13-tests-release