Merge "Snap for 14471064 from 8b457ca3a9e12f6e3bdbc0c9bca9dc05e99747db to android12-tests-release" into android12-tests-release