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: 3ec8f9d5 am: 73e23da6

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



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