[automerger skipped] Merge "Forbid granting access to NLSes with too-long...

[automerger skipped] Merge "Forbid granting access to NLSes with too-long component names" into sc-dev am: a322492b am: eb8bc82a am: 98e33c93 -s ours

am skip reason: Merged-In I4c25d80978cb37a8fa1531f5045259d25ac64692 with SHA-1 6fcdbd0c is already in history

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



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