Merge "Accommodate a change in the type of std::span's size" into main am:...

Merge "Accommodate a change in the type of std::span's size" into main am: 33a78903 am: 19acbe68 am: 4779a4f7

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



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