Merge "Revert^4 "Run module code only after KeyMints receive module info""...

Merge "Revert^4 "Run module code only after KeyMints receive module info"" into main am: 158a0c9e am: 6f5e5ae2

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



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