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