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

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

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