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

Change-Id: I49cb14648aa8a0ccdc9a27443276c0c9542cdc8f