am dc7b3e3b: am 9657ba0e: Merge "KeyStore: stop using state()"

# Via Android Git Automerger (1) and others
* commit 'dc7b3e3b6e1aa3f347c7d843ee453688c4d90e29':
  KeyStore: stop using state()

services/java/com/android/server/ConnectivityService.java

@@ -3341,7 +3341,7 @@ public class ConnectivityService extends IConnectivityManager.Stub {
         // Tear down existing lockdown if profile was removed
         mLockdownEnabled = LockdownVpnTracker.isEnabled();
         if (mLockdownEnabled) {
-            if (mKeyStore.state() != KeyStore.State.UNLOCKED) {
+            if (!mKeyStore.isUnlocked()) {
                 Slog.w(TAG, "KeyStore locked; unable to create LockdownTracker");
                 return false;
             }