Merge "Depend on KeyMint HAL via default" am: 9d64ce4011

Original change: https://android-review.googlesource.com/c/platform/system/keymaster/+/1904210

Change-Id: If4bf2039569028c61c03a1b9dd415b4b9ccbb17e