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

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



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