Update to support keymaster's configurable version. am: 66b1cfaac0

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1507156

Change-Id: I0d27cd1d5d244c9cc7fc34ffe59133fa58b391f7