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