Merge "Collect xTS jar/apk packages from soong intermediate dirs" into main am: 69fe181b

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



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