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

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

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



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