Merge changes Id3b578a8,Ibb928c92 am: 5789f943 am: 6700a84a am: 45209264 am: 9682b938

Original change: https://android-review.googlesource.com/c/platform/packages/modules/DnsResolver/+/2556273



Change-Id: Ibffea3dc8f20884a6efce36e72de5eead0748611
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>