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

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

am skip reason: subject contains skip directive

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

Change-Id: Ic959e7d1abae53e01e408dd31dd1c88ba41d3b86