am b47d73dd: am fc981489: am 09af5497: am ff4903b6: Merge "AndroidKeyStore: enforce keys have no encoding" into klp-dev * commit 'b47d73dd': AndroidKeyStore: enforce keys have no encoding