[automerger skipped] Merge "Forbid granting access to NLSes with too-long component names" into tm-dev am: b70ba506ef am: 491eefec5c -s ours
am skip reason: Merged-In I4c25d80978cb37a8fa1531f5045259d25ac64692 with SHA-1 01db5929b2 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23733070
Change-Id: I1b4ff2e4d7c47fcff70d99b63784b0887deeea7a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: