Merge "Add tablet-specific version of string" into tm-dev am: 05f0f092 am: 3ec8f9d5

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



Change-Id: I5f009ccf517b336342597e53ae5d6d454c1ed529
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>