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

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

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