!1016 回退samgr的启动时间

Merge pull request !1016 from qilongzhang/for_merge_0802

services/etc/init.cfg

@@ -21,8 +21,7 @@
                 "load_persist_params ",
                 "bootchart start",
                 "chown access_token access_token /dev/access_token_id",
-                "chmod 0666 /dev/access_token_id",
-                "start samgr"
+                "chmod 0666 /dev/access_token_id"
             ]
         }, {
             "name" : "init",

services/init/standard/init_cmds.c

@@ -460,6 +460,10 @@ static void DoInitMainUser(const struct CmdArgs *ctx)
         INIT_LOGE("DoInitMainUser: para invalid");
         return;
     }
+    if (!InitFscryptPolicy()) {
+        INIT_LOGI("DoInitMainUser:init fscrypt failed,not enable fscrypt");
+        return;
+    }
 
     char * const argv[] = {
         "/system/bin/sdc",