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: 8a6a419d

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



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