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

Change-Id: Idbbe72dbb5506412b5017d31bb75408bb229d0a7