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

am skip reason: subject contains skip directive

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

Change-Id: Ie3150276e547a9dfbcfd283fb1badb35434f14b0