Merge TQ1A.221205.012

Bug: 255404110

Merged-In: Id2b5dcfb5d8f72c0003979262911ab5b8665a060
Change-Id: Ided03f35ef57e66f667a18eff75998c00409723c
diff --git a/googlebattery/dumpstate.te b/googlebattery/dumpstate.te
index b84095c..5de6a2e 100644
--- a/googlebattery/dumpstate.te
+++ b/googlebattery/dumpstate.te
@@ -1,6 +1,3 @@
-userdebug_or_eng(`
-    # To find and bind Google Battery HAL
-    allow dumpstate hal_googlebattery_service:service_manager find;
-    binder_call(dumpstate, hal_googlebattery)
-')
-
+# To find and bind Google Battery HAL
+allow dumpstate hal_googlebattery_service:service_manager find;
+binder_call(dumpstate, hal_googlebattery)