Merge "[automerger skipped] Merge "Extend ResolverTest.BrokenEdns to cover...
Merge "[automerger skipped] Merge "Extend ResolverTest.BrokenEdns to cover using EDNS0 for cleartext DNS" into rvc-dev am: 7384ec8d am: 3a03b844 -s ours" into rvc-d1-dev-plus-aosp