resolved conflicts for merge of 814f5ac to jb-mr1-dev

Change-Id: Ic65395ce932971dc9c37a481aa96da79a45d0f12

Author: Amith Yamasani

services/java/com/android/server/SystemServer.java

@@ -768,6 +768,12 @@ public void run() {
             reportWtf("making Vibrator Service ready", e);
         }
 
+        try {
+            lockSettings.systemReady();
+        } catch (Throwable e) {
+            reportWtf("making Lock Settings Service ready", e);
+        }
+
         if (devicePolicy != null) {
             try {
                 devicePolicy.systemReady();
@@ -784,12 +790,6 @@ public void run() {
             }
         }
 
-        try {
-            lockSettings.systemReady();
-        } catch (Throwable e) {
-            reportWtf("making Lock Settings Service ready", e);
-        }
-
         try {
             wm.systemReady();
         } catch (Throwable e) {