Merge "Use IDnsResolverUnsolicitedEventListener" am: a476ef4d57 am: 77a35d12ac

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iabcc9dc41b5e51920c7d67d89c90e1e2c7e3e45c