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

Original change: https://android-review.googlesource.com/c/platform/build/+/2783599

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

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} \{