[automerger skipped] Settings: don't try to allow NLSes with too-long...

[automerger skipped] Settings: don't try to allow NLSes with too-long component names am: b88fbf93 am: 42afd3c1 -s ours am: 9dbcbfaa -s ours

am skip reason: Merged-In Ifc048311746c027e3683cdcf65f1079d04cf7c56 with SHA-1 027f0a46 is already in history

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



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