Merge "Snap for 10254767 from 11caad9d6c8ca8d849f3444857edb76bc3a91977 to android12L-tests-release" into android12L-tests-release