Merge "Snap for 11647682 from 191c93b6667669c1a51fcf690f491c6a30d31b56 to android12L-tests-release" into android12L-tests-release