[automerger skipped] Merge "Adds a few dependencies to the shared library."...

[automerger skipped] Merge "Adds a few dependencies to the shared library." into tm-qpr-dev am: ec62e37c -s ours am: 0457d5d2 -s ours

am skip reason: Merged-In I4e41a911891ff3ba30ff82163be1005ef3974be3 with SHA-1 97860c2a is already in history

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



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