Merge "Revert^2 "Add <uses-library> information."" am: a2e406ed85 am: 8403231bbb

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1526684

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9a772056ff7f76d79e2f4864e0e796b5fddc1a27