Merge "Remove APEX from merged target-files package" into main am: 2ee7f71e...

Merge "Remove APEX from merged target-files package" into main am: 2ee7f71e am: b8670586 am: 22a5b29a

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



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