Merge "Refactor apexBundle code." am: 114ad30d76 am: 7028b50308 am: a416730bf1

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

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