Merge "Snap for 10011760 from 5141eaf353e7838de6eaaabe375ee1ffa275433b to android12L-tests-release" into android12L-tests-release