[automerger skipped] Merge Android 14 QPR1 am: b7f8f545 -s ours

am skip reason: Merged-In I668bbfe6942526dae1840e36c21abb05fe033e9a with SHA-1 2787b9e2 is already in history

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



Change-Id: I8774233a481f36ab22d90bf30b6042ca282d312f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>