Merge "Include module dependencies under `data`" am: 270ea8a533 am: 730acbd296

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

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