Merge "Hide @IntDef and @StringDef annotations from AnroidKeyStore API." into mnc-dev

diff --cc api/current.txt
Simple merge

diff --cc api/system-current.txt
Simple merge

diff --cc keystore/java/android/security/EcIesParameterSpec.java
index af93519,7af17ed..360270e
--- 1/keystore/java/android/security/EcIesParameterSpec.java
--- 2/keystore/java/android/security/EcIesParameterSpec.java
+++ b/keystore/java/android/security/EcIesParameterSpec.java
@@@ -51,12 -49,11 +51,15 @@@ import javax.crypto.Mac
   */
  public class EcIesParameterSpec implements AlgorithmParameterSpec {
  
+     /**
+      * @hide
+      */
      @Retention(RetentionPolicy.SOURCE)
 -    @IntDef(value = {PointFormat.UNCOMPRESSED, PointFormat.COMPRESSED})
 +    @IntDef({
 +        PointFormat.UNSPECIFIED,
 +        PointFormat.UNCOMPRESSED,
 +        PointFormat.COMPRESSED,
 +        })
      public @interface PointFormatEnum {}
  
      /**

diff --cc keystore/java/android/security/KeyStoreKeyProperties.java
Simple merge