Merge "Update language to comply with Android's inclusive language guidance" am: e859848f9f

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1378577

Change-Id: Ic9fbb4297bedaa440c06bd0cb2e8817c6fbd1283

cmds/statsd/src/config/ConfigManager.cpp

@@ -57,7 +57,7 @@ void ConfigManager::Startup() {
 }
 
 void ConfigManager::StartupForTest() {
-    // Dummy function to avoid reading configs from disks for tests.
+    // No-op function to avoid reading configs from disks for tests.
 }
 
 void ConfigManager::AddListener(const sp<ConfigListener>& listener) {

cmds/statsd/src/config/ConfigManager.h

@@ -44,7 +44,7 @@ public:
     void Startup();
 
     /*
-     * Dummy initializer for tests.
+     * No-op initializer for tests.
      */
     void StartupForTest();