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

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

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