Merge "Fix bugprone-branch-clone warnings" am: e7d8d30f am: 87808b04 am:...

Merge "Fix bugprone-branch-clone warnings" am: e7d8d30f am: 87808b04 am: ae156170 am: 5b17c880 am: b1deb126

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



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