!1898 Resolving conflicts leads to overrides

Merge pull request !1898 from ShiJie/master

powermgr/BUILD.gn

@@ -21,6 +21,7 @@ group("powermgr") {
     if (is_standard_system) {
       deps = [
         "powermgrbattery:powermgr_battery_test",
+        "powermgrbatterystats:powermgr_batterystats_test",
         "powermgrthermal:powermgr_thermal_test",
       ]
     }