am ed0f7935: am 9163199a: am e2cf7d5d: am d478830e: am 9f6c572b: Merge "Revert "-Change persist.radio.data_no_toggle=1 to improve modem power reporting accuracy."" into mnc-dev

* commit 'ed0f7935cfcf42d7a5c1c3de2a1be40e7b57a738':
  Revert "-Change persist.radio.data_no_toggle=1 to improve modem power reporting accuracy."
diff --git a/device.mk b/device.mk
index 914e156..2c313ec 100644
--- a/device.mk
+++ b/device.mk
@@ -260,11 +260,6 @@
     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 8278645..63e7144 100644
--- a/init.shamu.rc
+++ b/init.shamu.rc
@@ -339,6 +339,9 @@
 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