[automerger skipped] DO NOT MERGE - Merge ab/7272582 am: 9d08a4f7 am:...

[automerger skipped] DO NOT MERGE - Merge ab/7272582 am: 9d08a4f7 am: 0421f77c -s ours am: ee4a2e4a -s ours

am skip reason: subject contains skip directive

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

Change-Id: Ib1019ebada7bd92633d88b3291b0123660296776