Merge "Include module dependencies under `data`" am: 0a43a37ca0

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

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