[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: 491eefec -s ours am: 8951842a -s ours

am skip reason: Merged-In I4c25d80978cb37a8fa1531f5045259d25ac64692 with SHA-1 01db5929 is already in history

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



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