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

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



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