Merge changes I02545dbe,I37759a1b,Idff35a3d am: 5ad0ac0e am: 09c33ed3 am:...

Merge changes I02545dbe,I37759a1b,Idff35a3d am: 5ad0ac0e am: 09c33ed3 am: e2d8f394 am: c2c47dc9 am: 61717b66

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



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