[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: 8ba65e28 -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: I11212720ab54b684910e83896f78a2d32747eb68