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

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



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