[automerger skipped] Merge "Add module info AIDL changes and bump the KeyMint...

[automerger skipped] Merge "Add module info AIDL changes and bump the KeyMint version" into main am: 28e04e62 am: 2d37d4fe -s ours

am skip reason: Merged-In Idb11823e6b65cf17d62ae8687febffee860565e3 with SHA-1 ea426cbf is already in history

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/3326628



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