Merge "feat: show if flag is locally overridden" into main

tools/aconfig/aflags/src/aconfig_storage_source.rs

@@ -65,7 +65,9 @@ fn reconcile(
         } else {
             FlagPermission::ReadOnly
         };
-        let value_picked_from = if Some(value) == default_value {
+        let value_picked_from = if listed_flag.has_local_override {
+            ValuePickedFrom::Local
+        } else if Some(value) == default_value {
             ValuePickedFrom::Default
         } else {
             ValuePickedFrom::Server

tools/aconfig/aflags/src/main.rs

@@ -50,6 +50,7 @@ impl std::fmt::Display for FlagPermission {
 enum ValuePickedFrom {
     Default,
     Server,
+    Local,
 }
 
 impl std::fmt::Display for ValuePickedFrom {
@@ -60,6 +61,7 @@ impl std::fmt::Display for ValuePickedFrom {
             match &self {
                 Self::Default => "default",
                 Self::Server => "server",
+                Self::Local => "local",
             }
         )
     }