[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: 3de8d21f -s ours am: 7bce25f6 -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: I5823ecc413b7467c6e81ce84e5be76c202707f13
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>