Merge "Include module dependencies under `data`" am: c6b36ad4

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



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