[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 tm-dev am: b70ba506 am: 5002b7bd am: 29f81157 am: a91275c8 -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/+/23733070



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