Merge "Use defaults to reference current keymint version" am: ddf63247 am:...

Merge "Use defaults to reference current keymint version" am: ddf63247 am: 2fedeb57 am: 5a903ea2

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

Change-Id: I30440a13b7696158b05c9ff613f3aa0186586c49