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