Merge "Include module dependencies under `data`" am: 3b7aaf64ec am: f038500803 am: 432856d10e am: f767e74552 am: 561653ba88

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

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