Merge "Rename trustedUserPresenceRequired." into pi-dev

diff --cc api/current.txt
index 8cba5cb,960c61f..9f4084c
--- 1/api/current.txt
--- 2/api/current.txt
+++ b/api/current.txt
@@@ -38725,20 -38724,10 +38724,21 @@@ package android.security.keystore 
      method public android.security.keystore.KeyProtection.Builder setUserAuthenticationValidWhileOnBody(boolean);
      method public android.security.keystore.KeyProtection.Builder setUserAuthenticationValidityDurationSeconds(int);
      method public android.security.keystore.KeyProtection.Builder setUserConfirmationRequired(boolean);
+     method public android.security.keystore.KeyProtection.Builder setUserPresenceRequired(boolean);
    }
  
 +  public class SecureKeyImportUnavailableException extends java.security.ProviderException {
 +    ctor public SecureKeyImportUnavailableException();
 +    ctor public SecureKeyImportUnavailableException(java.lang.String);
 +    ctor public SecureKeyImportUnavailableException(java.lang.String, java.lang.Throwable);
 +    ctor public SecureKeyImportUnavailableException(java.lang.Throwable);
 +  }
 +
    public class StrongBoxUnavailableException extends java.security.ProviderException {
 +    ctor public StrongBoxUnavailableException();
 +    ctor public StrongBoxUnavailableException(java.lang.String);
 +    ctor public StrongBoxUnavailableException(java.lang.String, java.lang.Throwable);
 +    ctor public StrongBoxUnavailableException(java.lang.Throwable);
    }
  
    public class UserNotAuthenticatedException extends java.security.InvalidKeyException {