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

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



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