aml Release es_331611010 (9621810,com.google.android.resolv)
Snap for 8564071 from a7af87e5bf47a1b3ae2945c09f466d476d89a229 to mainline-resolv-release

Change-Id: I8a52092d89d63311f975e9675e65d8fa6186c575