Merge "Allow summary string support both mobile and tablet devices" into...

Merge "Allow summary string support both mobile and tablet devices" into tm-qpr-dev am: 97985b62 am: 41e66952

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



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