Merge "Add helpers for populating apex module info" into main am: efd63446ec am: 7ee0137d18

Original change: https://android-review.googlesource.com/c/platform/system/security/+/3391692

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