Merge "Snap for 15815862 from 95169c31f075dbff9b3c542bb98eb395ccd21b5a to android12L-tests-release" into android12L-tests-release