Merge "Migrate PeriodicSyncs from old format" into nyc-dev

am: 3e09cd4d79

* commit '3e09cd4d79f8bd583f833ba4c37868a7d3f3746a':
  Migrate PeriodicSyncs from old format

services/core/java/com/android/server/content/SyncManager.java

@@ -2271,6 +2271,7 @@ public class SyncManager {
         void checkIfDeviceReady() {
             if (mProvisioned && mBootCompleted) {
                 synchronized(this) {
+                    mSyncStorageEngine.restoreAllPeriodicSyncs();
                     // Dispatch any stashed messages.
                     obtainMessage(MESSAGE_RELEASE_MESSAGES_FROM_QUEUE).sendToTarget();
                 }
@@ -2622,7 +2623,6 @@ public class SyncManager {
             }
             if (mBootCompleted) {
                 doDatabaseCleanup();
-                mSyncStorageEngine.restoreAllPeriodicSyncs();
             }
 
             AccountAndUser[] accounts = mRunningAccounts;