am 36ee836d: Merge "Symmetric key generation for AndroidKeyStore."

* commit '36ee836d2f6e6df59d6a20a69421639bacf25559':
  Symmetric key generation for AndroidKeyStore.