Merge "[automerger skipped] [CDM] Validate component name length before...

Merge "[automerger skipped] [CDM] Validate component name length before requesting notification access. am: 6f5fc7f0 -s ours am: 5b3a2aaa -s ours am: 926c00ee -s ours am: 64afe7dc -s ours am: bd64be58 -s ours" into udc-d1-dev-plus-aosp am: c34e8b41 -s ours am: 9bb8e153 -s ours

am skip reason: Merged-In I7ea5d5c1f78858db9865f3310d1e0aff9c8b5579 with SHA-1 6f5fc7f0 is already in history

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



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