[automerger skipped] Revert "Adds a few dependencies to the shared library." am: f93309b2a5 -s ours

am skip reason: Merged-In I4e41a911891ff3ba30ff82163be1005ef3974be3 with SHA-1 97860c2a0e is already in history. Merged-In was found from reverted change.

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

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

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