Android mainline 12.0.0 release 16
Snap for 7734064 from 8b8a2155e8eb380c32072188d6ca9d59435afa41 to mainline-resolv-release

Change-Id: I1d103410611debee7302b7e660178b9813693c3e