Merge "Include module dependencies under `data`" am: c6b36ad475 am: 24f9c38615

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

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