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: 5200bf42 am: 92e2aabb am: d81842a7

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



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