[automerger skipped] Merge "Update DnsResolver AIDL interface version to 2" into qt-dev
am: 6dbbdde2 -s ours
am skip reason: change_id I0eb4162257cb3db0f2e615761c6ff79174212c62 with SHA1 c57738e2 is in history
Change-Id: I52516ab0acb4df31138d068c7bd9a4749e7307c3