Merge "Include module dependencies under `data`" am: 0a43a37c am: 2accab11 am: 748cecb7

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2528320



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