Merge "Use defaults to reference current keymint version" am: ddf63247e9

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

Change-Id: I8cec83ec6c73c7fbaba8c2340c56aee50addce7c