Merge "Update DnsManagerTest for AIDL interface change"