aml Release es_331314010 (9361298,com.google.android.resolv)
Snap for 9224945 from 6ef5a36e9d8c30eacc59ab6e1ea3c82d7c1e05e8 to mainline-resolv-release

Change-Id: Ice0697e126105e50fa78e7d3cad6db69cceca33d