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

[automerger skipped] Merge "[CDM] Validate component name length before requesting notification access." into udc-qpr-dev am: bbeab357 am: eb818d94 -s ours

am skip reason: Merged-In I7ea5d5c1f78858db9865f3310d1e0aff9c8b5579 with SHA-1 067a0e3e is already in history

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



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