[automerger skipped] Merge "Update DnsManagerTest for AIDL interface change" am: e9b37e07 am: 1af8487e -s ours

am skip reason: Change-Id Ic53f42b968626294c851dac252a70769846ba427 with SHA-1 125db20e is in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1345375

Change-Id: I89da68283cb71ce1ee25734d481fa24f966f2042