[automerger skipped] Empty merge of sc-v2-dev-plus-aosp-without-vendor@8084891...

[automerger skipped] Empty merge of sc-v2-dev-plus-aosp-without-vendor@8084891 am: d1921116 -s ours am: 18e78c94 -s ours am: 0f9e96cc -s ours

am skip reason: Merged-In Ieb3124622e8a315a0df18e526bf2067d1d10bb47 with SHA-1 bf63150f is already in history

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

Change-Id: I73d4612952c56c971a2bf8600f542dfc98e4a4d5