Merge "Snap for 12359238 from cc742d3994bfa7b33f0e3628fa91fba4677c819f to android15-tests-release" into android15-tests-release