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

Change-Id: Ifba89a64a1bed8d7f0f571c3a28434733f387461