Merge "Include module dependencies under `data`" am: f4efd142b0

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/2486445

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