[conflict] Merge remote-tracking branch 'goog/main' into udc_d1 am: b0ff36ab8d

Original change: https://googleplex-android-review.googlesource.com/c/platform/external/android-nn-driver/+/24058492

Change-Id: I2675fa950aa8f729125f9067c5334bce4b924e02
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Merged-In: I4294170cb0cb69cad2b4f24e3ebc21d6f9601b0e
Merged-In: I2ebae622c183bd1bc3795763a7c0394c68bdf72f

1 files changed, 1 insertions, 0 deletions

diff --git a/Utils.cpp b/Utils.cpp
index cfae02c..48f06a9 100644
--- a/Utils.cpp
+++ b/Utils.cpp
@@ -21,6 +21,7 @@
 #include <cstdio>
 #include <time.h>
 #include <string>
+#include <span>
 
 using namespace android;
 using namespace android::hardware;