Merge "Update language to comply with Android's inclusive language guidance" am: e859848f9f am: e5da315dd7 am: 6ba33c095c am: e9a5aca11d

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

Change-Id: I2c5ec07b9ac4f3c49c002f7d0ea4044316928644

cmds/statsd/src/config/ConfigManager.cpp

@@ -128,7 +128,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

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