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

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

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



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