Merge "aconfig: add missing string header to template" into main

tools/aconfig/src/codegen_cpp.rs

@@ -365,6 +365,7 @@ bool com_android_aconfig_test_enabled_rw() {
 #include "com_android_aconfig_test.h"
 #include <server_configurable_flags/get_flags.h>
 #include <unordered_map>
+#include <string>
 
 namespace com::android::aconfig::test {
 

tools/aconfig/templates/cpp_source_file.template

@@ -4,6 +4,7 @@
 {{ endif }}
 {{ if for_test }}
 #include <unordered_map>
+#include <string>
 {{ endif }}
 
 namespace {cpp_namespace} \{