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 am: 39d1f823

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



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