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 am: b9d17b97

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



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