Merge "Don't limit carrier text when using large screen" into tm-qpr-dev am: 314f1bf8

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20175649



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