Merge "Keystore 2.0: Add @IntDef for Keystore namespaces."