Merge "Include module dependencies under `data`" am: f4efd142 am: dd470f18...

Merge "Include module dependencies under `data`" am: f4efd142 am: dd470f18 am: 4e604360 am: 3fcae3cd am: 7b166316

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



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