Merge "Stop prebuilt_apex/apex_set exporting invalid jars to Make" am: 13dd220448 am: 964d2d7a51 am: a242a29f0e

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

Change-Id: If4b89f5fc76ffdc341d4c60547cef68c427dfff3