-Change persist.radio.data_no_toggle=1 to improve modem power
 reporting accuracy.

bug: 22095727
Change-Id: Ifc9b929e10121c71cf8b4a8afb250ec15fa547b7
diff --git a/device.mk b/device.mk
index bba8ebb..41e2288 100644
--- a/device.mk
+++ b/device.mk
@@ -247,6 +247,11 @@
     persist.radio.fsg_reload_on=1 \
     persist.radio.mcfg_enabled=1
 
+# If data_no_toggle is 1 then active and dormancy enable at all times.
+# If data_no_toggle is 0 there are no reports if the screen is off.
+PRODUCT_PROPERTY_OVERRIDES += \
+     persist.radio.data_no_toggle=1
+
 # Camera configuration
 PRODUCT_DEFAULT_PROPERTY_OVERRIDES += \
     camera.disable_zsl_mode=0
diff --git a/init.shamu.rc b/init.shamu.rc
index 63e7144..8278645 100644
--- a/init.shamu.rc
+++ b/init.shamu.rc
@@ -339,9 +339,6 @@
 on property:ro.bluetooth.ftm_enabled=true
     start ftmd
 
-on property:persist.env.fastdorm.enabled=true
-    setprop persist.radio.data_no_toggle 1
-
 service irsc_util /system/bin/irsc_util "/etc/sec_config"
     class main
     user root