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