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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ibdd9fef3e5b32ec70d542a0e3e8533d328d4641f