Merge "Add module info AIDL changes and bump the KeyMint version" into main