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: aaddfd88 am: 9feb898d am: bb3122ca

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



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