Merge "Adds a few dependencies to the shared library." into tm-qpr-dev-plus-aosp am: 0a538977

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



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