am b00af8f1: Merge "AndroidKeyStore: enforce keys have no encoding"

* commit 'b00af8f14b45e0c163cdd8d1998f2bd1714e54e6':
  AndroidKeyStore: enforce keys have no encoding