Merge "Snap for 11360181 from ce34e325563d7d4c370c207480c233712e2a3d1f to android12-tests-release" into android12-tests-release