Merge "Remove unused strings" into tm-qpr-dev am: aaf0434b1c am: 1bbd4f97e1

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

Change-Id: I5b52209c6026585c5169aca78e6d18ce6898f75b
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>