Merge "Add BatteryUsageStatsProtoTests to presubmit" into sc-dev am: 0a9650dcde

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

Change-Id: Ic4629bc93e9540b3d9e150cf256b83571a3baead

core/java/com/android/internal/os/TEST_MAPPING

@@ -12,6 +12,14 @@
         { "exclude-annotation": "com.android.internal.os.SkipPresubmit" }
       ]
     },
+    {
+      "file_patterns": [
+        "Battery[^/]*\\.java",
+        "Kernel[^/]*\\.java",
+        "[^/]*Power[^/]*\\.java"
+      ],
+      "name": "BatteryUsageStatsProtoTests"
+    },
     {
       "file_patterns": [
         "BinderDeathDispatcher\\.java"
@@ -23,7 +31,11 @@
       ]
     },
     {
-      "file_patterns": ["Battery[^/]*\\.java"],
+      "file_patterns": [
+        "Battery[^/]*\\.java",
+        "Kernel[^/]*\\.java",
+        "[^/]*Power[^/]*\\.java"
+      ],
       "name": "FrameworksServicesTests",
       "options": [
         { "include-filter": "com.android.server.am.BatteryStatsServiceTest" },