Merge "Add Rfc6724 style sort for DnsResolver and fix potential bug"
am: 7a1133eb44

Change-Id: I0323f5c7f32fc3fa589b9e87f8e7c9caf744dbd4