Merge cherrypicks of [20123687] into tm-qpr1-release.
Change-Id: I40755bc35a549dae96251e8c79998784a277afa3
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)