[automerger skipped] Merge "Adding UID to NetwrokDnsEventReported atom" into...

[automerger skipped] Merge "Adding UID to NetwrokDnsEventReported atom" into main am: 34671298 am: 9f6de4c5 -s ours am: 1a3831bc -s ours

am skip reason: Merged-In Ied14657053cbef280311badd23cecb3951ce6835 with SHA-1 b9058840 is already in history

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



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