Merge "Complete dependency that are used by module" am: e40f4a24 am: 3c206d6c

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



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