Android Mainline 12.0.0 Release 80 (8339069,com.google.android.resolv)
Snap for 7550930 from 25ed116dc3d09afb76124eb7cdd43f03e87afdec to mainline-resolv-release

Change-Id: Ice9d777deca7c5e5605ed5b994d8045ddea760f6