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

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



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