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

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



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