Merge "Update to support keymaster's configurable version." am: efb51f7ddf

Original change: https://android-review.googlesource.com/c/platform/system/security/+/1507176

Change-Id: Id88d30a3df421a718fac2252ef43b54c5d783b6b