Merge "gpuservice: Always reset feature overrides when parsing" into main

Author: Treehugger Robot

services/gpuservice/feature_override/FeatureOverrideParser.cpp

@@ -90,14 +90,16 @@ bool FeatureOverrideParser::shouldReloadFeatureOverrides() const {
 }
 
 void FeatureOverrideParser::forceFileRead() {
-    resetFeatureOverrides(mFeatureOverrides);
     mLastProtobufReadTime = 0;
 }
 
 void FeatureOverrideParser::parseFeatureOverrides() {
     const feature_override::FeatureOverrideProtos overridesProtos = readFeatureConfigProtos(
             getFeatureOverrideFilePath());
 
+    // Clear out the stale values before adding the newly parsed data.
+    resetFeatureOverrides(mFeatureOverrides);
+
     // Global feature overrides.
     for (const auto &featureConfigProto: overridesProtos.global_features()) {
         FeatureConfig featureConfig;