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

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



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