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: 2758ef4c

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



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