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

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

Change-Id: I7d634461a1d404957133bac7da1fe043c02609a5