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

am skip reason: Change-Id I373fc134a56abc12dc3ff24b3cd144c9a37f4844 with SHA-1 3977d487 is in history

Change-Id: I3de83f14d56293993f558afaa6659c465948a42f