Merge "Use complete api-versions.xml for module-lib and system-server" into...

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

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



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