Merge "Include module dependencies under `data`" am: 932fe8ac1d am: 042455c19f am: 9ccba9558c am: 481a250e0b am: 63774084c6

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

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