aml Release es_331314010 (9361298,com.google.android.resolv)
Snap for 8748207 from ca6b4d4a1ae67e9d488781c482e8873d4c316f94 to mainline-resolv-release

Change-Id: I45451e96c4b1d6fd23d53b59793500284e493fca