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: de6ea8d6

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



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