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: 4f07b767 am: 0ebce61b

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



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