Merge "Revert^2 "Add <uses-library> information."" am: 6e35bf94ec am: 1f9067267a

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic44dcdcd401dd1afd9d31ba6bc5afb4d36cdb4de