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

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

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