Merge "Collect xTS jar/apk packages from soong intermediate dirs" into main...

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

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



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