Merge "Don't show NLSes with excessively long component names" into tm-qpr-dev...

Merge "Don't show NLSes with excessively long component names" into tm-qpr-dev am: 7626600b am: ce0c1c4d

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



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