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

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

Change-Id: I28071ec1e28610e9518cf8f279a8323b04e45eb5