Merge "Use complete api-versions.xml for module-lib and system-server" into main am: 5a990562

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



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