Merge "Revert^2 "Run module code only after KeyMints receive module info"" into main am: 54eaeb2f4c am: 987deca5ff

Original change: https://android-review.googlesource.com/c/platform/system/core/+/3438945

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