Merge "Revert^5 "Run module code only after KeyMints receive module info"" into main am: 82040a8c5b am: 84855526a5

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

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