Merge "Fix GetVersion2 bugs" am: c1bcbf479f

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

Change-Id: I7578bce8eb044c6455cb0b313913562533e7bcd0