Merge "Update string to be phone/tablet agnostic" into udc-dev am: a171a9d4

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23451841



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