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

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



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