Merge "Support Soong-generated module-info.json entries" into main am:...

Merge "Support Soong-generated module-info.json entries" into main am: 7f915994 am: 99edf49d am: 350450c7

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



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