Merge "Revert "Include module dependencies under `data`"" am: fa997797bd am: 64349ebdfc am: 1ae75d0d75

Original change: https://android-review.googlesource.com/c/platform/external/tremolo/+/2512096

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