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

Change-Id: I1f6d3cd062fa132548cf2e0729dce135b9cab677