Merge "Fix bugprone-branch-clone warnings" am: e7d8d30f

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



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