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

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

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



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