[automerger skipped] Merge "Forbid granting access to NLSes with too-long component names" into rvc-dev am: 7e6c75ccb5 am: af247aefd6 -s ours am: dcd80daf8a -s ours am: 59eb028c6c -s ours am: cbed626a19 -s ours am: cf9683418c -s ours

am skip reason: Merged-In I4c25d80978cb37a8fa1531f5045259d25ac64692 with SHA-1 8a40b0b3a1 is already in history

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

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