[automerger skipped] Add Rfc6724 style sort for DnsResolver and fix potential bug
am: 51b9f6c069 -s ours
am skip reason: change_id I0323f5c7f32fc3fa589b9e87f8e7c9caf744dbd4 with SHA1 d352f4ca85 is in history
Change-Id: Ie4e69c27646febd06df2b93361f431dbd51bde4f
This commit is contained in: