Merge "Add DnsResolverServiceManager" am: 6bc7032b85 am: b3ea5a5a71

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7e03c2432d2c0e95a8f157b94208cc81ad32ab3d