Merge "Include module dependencies under `data`" am: 270ea8a5 am: 730acbd2...

Merge "Include module dependencies under `data`" am: 270ea8a5 am: 730acbd2 am: 295eb472 am: 417cb914 am: 6c23dd64

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



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