Merge "Set the container field of aconfig flags" into main am: 4a8dc192c3 am: 71b89efc7e

Original change: https://android-review.googlesource.com/c/platform/system/security/+/2947640

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

fsverity_init/Android.bp

@@ -22,12 +22,17 @@ cc_binary {
         "libkeyutils",
         "liblog",
     ],
-    cflags: ["-Werror", "-Wall", "-Wextra"],
+    cflags: [
+        "-Werror",
+        "-Wall",
+        "-Wextra",
+    ],
 }
 
 aconfig_declarations {
     name: "aconfig_fsverity_init",
     package: "android.security.flag",
+    container: "system",
     srcs: ["flags.aconfig"],
 }
 

fsverity_init/flags.aconfig

@@ -1,4 +1,5 @@
 package: "android.security.flag"
+container: "system"
 
 flag {
     name: "deprecate_fsverity_init"

keystore2/Android.bp

@@ -158,6 +158,7 @@ rust_binary {
 aconfig_declarations {
     name: "keystore2_flags",
     package: "android.security.keystore2",
+    container: "system",
     srcs: ["aconfig/flags.aconfig"],
 }
 

keystore2/aconfig/flags.aconfig

@@ -1,4 +1,5 @@
 package: "android.security.keystore2"
+container: "system"
 
 flag {
   name: "wal_db_journalmode_v3"