Merge "Update string to be phone/tablet agnostic" into udc-dev am: a171a9d426
am: d8cfa9ad5f
am: 1346017c04
am: e915cb5296
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23451841 Change-Id: I9684662a7704fdab10ad43ce1b2a94393eb4c174 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: