Keystore 2.0: CLI fixes. am: 2cb4f090ae

Original change: https://android-review.googlesource.com/c/platform/system/security/+/1709669

Change-Id: I40a231b88572ce0c195334a676f0547e0e2127b3