[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: 7847d336 am: 253f948a -s ours am: e385aee1 -s ours am: 534649a2 -s ours am: b6d8bfb9 -s ours am: 913c6655 -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/+/23728493



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