Merge "Forbid granting access to NLSes with too-long component names" into...

Merge "Forbid granting access to NLSes with too-long component names" into udc-dev am: b84f6a4e am: 7de34f3e

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23728044



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