Android mainline 12.0.0 release 16
Snap for 7716385 from 5b8d69e9c53a0e7634769b0df1dc393801919704 to mainline-resolv-release

Change-Id: I38ce639b5bbb88224ec0297961df0cd146700673