Merge "Revert "Don't add flattened files apex as dependencies of an image...

Merge "Revert "Don't add flattened files apex as dependencies of an image apex"" am: fe458716 am: da788455 am: 347f7f73

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



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