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: 71e8c1cd am: 06ffff89 am: 8bfce75f

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



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