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

Merge "Add tablet-specific version of string" into tm-dev am: 05f0f092 am: 1930c6b7 am: cd359f22 am: 7af4ed77

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



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