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

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

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



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