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

Merge "[automerger skipped] Merge "Forbid granting access to NLSes with too-long component names" into rvc-dev am: 7e6c75cc am: af247aef -s ours am: dcd80daf -s ours am: 59eb028c -s ours am: cbed626a -s ours am: cf968341 -s ours am: d9211df8 -s ours am: 50ba4b02 -s ours am: b91edcc6 -s ours" into udc-dev-plus-aosp am: e6632eed -s ours

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

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



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