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

Merge changes Id3b578a8,Ibb928c92 am: 5789f943 am: 6700a84a am: 45209264 am: 9682b938 am: 255e15b4 am: e51eb882 am: 838e1121 am: a8dd98f6

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



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