Merge "Depend on KeyMint HAL via default" am: 02345ce552 am: 4f4d0ca32e am: 4b6d97adae am: 55705c5487

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

Change-Id: I6df365388b927254a5b7d62c43251dcde43feb4d