[automerger skipped] Use base64 0.21.0 am: 8667ff4d -s ours am: 49d9b670...

[automerger skipped] Use base64 0.21.0 am: 8667ff4d -s ours am: 49d9b670 -s ours am: 63b99df0 -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: I6379c1c6054dcb3b19982a535e1b916d4f4042db
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>