Merge "Create image apexes by default instead of flattened apexes" am: 14108b6a

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



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