Merge "Include module dependencies under `data`" am: c6b36ad4 am: 24f9c386...

Merge "Include module dependencies under `data`" am: c6b36ad4 am: 24f9c386 am: 3a8e06ad am: b8cf918b

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



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