Merge "Include module dependencies under `data`" am: 932fe8ac am: 042455c1...

Merge "Include module dependencies under `data`" am: 932fe8ac am: 042455c1 am: 9ccba955 am: 481a250e

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2486137



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