Merge "Snap for 9900184 from 2032ac9bb8d6b93414181764bfde403d2a071007 to android12L-tests-release" into android12L-tests-release