Update to support keymaster's configurable version. am: 66b1cfaac0 am: 4c8b056838 am: 9507f9b3fc

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

Change-Id: I100c9e19ffe1ff62425befa8dc98c409b23cc217