Merge "Move logic to disable flattening in unbundled app mode from Soong to...

Merge "Move logic to disable flattening in unbundled app mode from Soong to make." am: 0770a175 am: 8f8a1abe am: 7e6cf317 am: 615af60f

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

Change-Id: I8113e7a41d32393707864007ee6120a54830900a