Merge "New AndroidKeyStore API in android.security.keystore." into mnc-dev