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

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

am skip reason: Merged-In I83799c36a1028564468b2335940a20659955fe21 with SHA-1 8667ff4d is already in history

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



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