Merge "Support generating xTS classes extends/implements API classes" into...

Merge "Support generating xTS classes extends/implements API classes" into main am: 8b83eeb2 am: f0ff8729

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



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