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

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

Change-Id: Icb6d7384bbf2b362172bf2f858af2c7f65387e93