Merge "Removing binder access to deprecated KeyStore function reset" am: 9eb7fcfba6

am: 0ae9cd3faa

Change-Id: I26ddf960c24e3a8706fc32fbaabe54e772ff9e02

keystore/java/android/security/KeyStore.java

@@ -348,16 +348,6 @@ public class KeyStore {
         return list(prefix, UID_SELF);
     }
 
-    @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023)
-    public boolean reset() {
-        try {
-            return mBinder.reset() == NO_ERROR;
-        } catch (RemoteException e) {
-            Log.w(TAG, "Cannot connect to keystore", e);
-            return false;
-        }
-    }
-
     /**
      * Attempt to lock the keystore for {@code user}.
      *