Merge changes from topic "mod-info-foreach" into main am: e75c063d am:...

Merge changes from topic "mod-info-foreach" into main am: e75c063d am: 4bbf7a86 am: 53ddfdb0 am: ae970ba4 am: bb936151

Original change: https://android-review.googlesource.com/c/platform/build/+/2617522



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