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

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



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