am 24244c44: am a8232452: Merge "Fix Android Keystore key gen for keys...
am 24244c44: am a8232452: Merge "Fix Android Keystore key gen for keys requiring user auth." into mnc-dev
* commit '24244c44':
Fix Android Keystore key gen for keys requiring user auth.