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

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



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