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

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

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