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

Change-Id: Ia1b417b57ca42d81a733087474079e034d09f9b3