Merge "Declare support for v4 of KeyMint HAL" into main am: 91b97d7362

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

Change-Id: I000aa524e78fdad8f7220a670a3aa58b0bbb10ad
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>