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

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



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