Merge "Annotate symbols correctly" am: 7eeed85c am: f33565c3 am: d7ae21f1 am: 891b6fe9

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



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