Merge "Include module dependencies under `data`" am: 73482477 am: 1d6424c2...

Merge "Include module dependencies under `data`" am: 73482477 am: 1d6424c2 am: ba560763 am: f3f8e10b am: 828a7854

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2526119



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