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

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



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