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

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

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