Android mainline 12.0.0 release 16
Snap for 7550930 from 8202942b5c51a663db92a1ae6edd1af9a9245ac3 to mainline-resolv-release

Change-Id: I2cd9f99e41d0361b236b15522ad6525ff883aecb