Merge "Snap for 9144048 from 6aa3bdfb161af9c190df44efa1c3160fc6b71314 to android12L-tests-release" into android12L-tests-release