Merge "Simplify module-info.json by leaving out optional fields" into main am:...

Merge "Simplify module-info.json by leaving out optional fields" into main am: 8bb84827 am: 78c9696a am: 84035d97

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



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