Merge "Fix layout to handle long carrier text" into tm-qpr-dev am: 2670c8a6 am: 4180c689

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



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