Merge "Depend on KeyMint HAL via default" am: 93f4b0afe7

Original change: https://android-review.googlesource.com/c/platform/system/core/+/1904171

Change-Id: Iac644b8ff00d19cb13e1ce9853b7fe2ad4a342a0