Merge "Refine the proto dns_resolver.proto"
am: 257719b2d5

Change-Id: Idfe00a6714ca64ea1850b1c333d8b54afa3723f1