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

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

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



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