Merge "Refactor apexBundle code." am: 114ad30d76 am: 7028b50308 am: a416730bf1 am: 05941e95e1 am: 4f7d0eb241

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

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