[automerger skipped] Merge "Use base64 0.21.0" am: 5e544436 -s ours am:...

[automerger skipped] Merge "Use base64 0.21.0" am: 5e544436 -s ours am: 81a6f55b -s ours am: a3577ca8 -s ours

am skip reason: Merged-In I83799c36a1028564468b2335940a20659955fe21 with SHA-1 090bcf7a is already in history

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



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