Merge "Revert "Add <uses-library> information."" am: 3ecd90395a am: 529e76109f am: 5b3715a184

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia065e23238f4c29cd98b26b78e6a2761e773665d