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: e20f52a0 am: 281c4b63

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



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