Merge "Revert^2 "Keymint 3.0 & IAR Support added"" into main am: 58107963ca

Original change: https://android-review.googlesource.com/c/platform/hardware/nxp/keymint/+/2862773

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