Merge "Fix GetVersion2 bugs" am: c1bcbf479f am: 2a6b44315f am: 2c014c555f

Original change: https://android-review.googlesource.com/c/platform/system/keymaster/+/1688365

Change-Id: I2e2b79dc7fe741563a3e0a59ab4b416f9d90c11e