[automerger skipped] Merge "Extend ResolverTest.BrokenEdns to cover using...
[automerger skipped] Merge "Extend ResolverTest.BrokenEdns to cover using EDNS0 for cleartext DNS" into rvc-dev am: 7384ec8d -s ours
am skip reason: Change-Id I373fc134a56abc12dc3ff24b3cd144c9a37f4844 with SHA-1 3977d487 is in history
Change-Id: Iaa4e464962f38d800324d70d03b7e4b153a2a144