[automerger skipped] Freeze DnsResolver AIDL API as v4. am: 05922e38 -s ours...
[automerger skipped] Freeze DnsResolver AIDL API as v4. am: 05922e38 -s ours am: aab8ca66 -s ours
am skip reason: Change-Id I5cbae9a5039c88bf111bacf18f3c01a2cf72ed75 with SHA-1 e1ddf098 is in history
Change-Id: I7f1aa25c7a6e50bd617a86ddc8d3c8688c78a9fd