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