[automerger skipped] Merge "Use base64 0.21.0" am: 5e544436 am: 2db14d0e...

[automerger skipped] Merge "Use base64 0.21.0" am: 5e544436 am: 2db14d0e am: 05b7b4e3 -s ours am: 5f872481 -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: I22bf47e7b359b6dd14022a17b8d042f31a654455
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>