aml Release es_331611010 (9621810,com.google.android.resolv)
Snap for 9224945 from 66dbf565dc0d56e399c518f7b98328bf761735c0 to mainline-resolv-release

Change-Id: Ib911458d51566b1f987a19403791c8c42caa2550