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