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

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



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