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

Change-Id: I30ab47ef263b7f82835a4c4e7d017e57ca16c0f2