Merge "Use defaults to reference current keymint version" am: ddf63247e9 am: 2fedeb5718 am: 5a903ea23a

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

Change-Id: I30440a13b7696158b05c9ff613f3aa0186586c49