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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ifb6141adf3eeb096ac610e01a458d47492e68ea0