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

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



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