Merge "Revert "Include module dependencies under `data`"" am: aa763638 am:...

Merge "Revert "Include module dependencies under `data`"" am: aa763638 am: 86c34e14 am: d90fb50b am: 2c0a8604 am: efe9e0f7

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



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