Merge "Do not tie managed profile synchronously in onUnlockUser()" into nyc-dev

diff --cc services/core/java/com/android/server/LockSettingsService.java
index 4477e8b,7e39a91..b6df0ba
--- 1/services/core/java/com/android/server/LockSettingsService.java
--- 2/services/core/java/com/android/server/LockSettingsService.java
+++ b/services/core/java/com/android/server/LockSettingsService.java
@@@ -118,9 -119,9 +119,10 @@@ public class LockSettingsService extend
      private final Object mSeparateChallengeLock = new Object();
  
      private final Context mContext;
+     private final Handler mHandler;
      private final LockSettingsStorage mStorage;
      private final LockSettingsStrongAuth mStrongAuth;
 +    private final SynchronizedStrongAuthTracker mStrongAuthTracker;
  
      private LockPatternUtils mLockPatternUtils;
      private boolean mFirstCallToVold;