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

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

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