Merge cherrypicks of [2622852, 2622193, 2622194, 2622195, 2622933, 2622990, 2622991, 2622992, 2622993, 2622994, 2622995, 2622934, 2622196, 2622975, 2622996, 2622997, 2622998, 2623050, 2622935, 2622197, 2623051, 2622936, 2622918, 2622919, 2622999] into oc-release

Change-Id: I736152649518f72007b8b66ef088841aa2b159ab
diff --git a/init.angler.rc b/init.angler.rc
index 775344a..04859e6 100755
--- a/init.angler.rc
+++ b/init.angler.rc
@@ -478,7 +478,7 @@
    oneshot
 
 service radio-sh /system/bin/init.radio.sh
-    class late_start
+    class main
     user radio
     group root radio
     oneshot