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: 18aa6d73

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



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