Merge "Include module dependencies under `data`" am: 1216a70f04 am: f3519ad420

Original change: https://android-review.googlesource.com/c/platform/tools/test/graphicsbenchmark/+/2486735

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