Merge "Remove api-versions-jars-dir from api_versions_base_defaults" into main...

Merge "Remove api-versions-jars-dir from api_versions_base_defaults" into main am: f8490737 am: a8a301b1

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3451795



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