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

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

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