Merge "AndroidKeyStore: Add encrypted flag"