Merge "Fix Android Keystore key gen for keys requiring user auth." into mnc-dev