[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: f1af8c52 am: 42bd4d88 -s ours am: 9eb2824b -s ours am: 97ecfd35 -s ours am: c4aa3101 -s ours am: d828f6a9 -s ours am: b280f879 -s ours

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

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



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