Merge "AndroidKeyStore: enforce keys have no encoding"