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 am: 63a50999 am: f03e08c6

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



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