[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: f0367c98 am: 59856126 am: 95fbc856 -s ours am: 8c1394e5 -s ours am: df3f3ff5 -s ours am: a590ecb7 -s ours am: b0bf5532 -s ours am: b5fe3c7a -s ours

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

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



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