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

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

Change-Id: Iecb4a24bd11de293eac749ee33caca7a1aa69857