Merge "Forbid granting access to NLSes with too-long component names" into sc-dev am: a322492bbe am: eb8bc82a83

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

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