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

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

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