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

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

Change-Id: Ib30b0b9914958a64caf109029cc17808296f64d5