Merge "Settings: don't try to allow NLSes with too-long component names" into...

Merge "Settings: don't try to allow NLSes with too-long component names" into udc-dev am: 4d34eb2c am: 0d215262

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



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