Merge "Keep dependency files out of the apk file." am: 5f58c378 am: d4a37e07

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



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