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

[automerger skipped] Merge "[CDM] Validate component name length before requesting notification access." into tm-qpr-dev am: 76309e59 -s ours am: 06cc3d00 -s ours am: 89696484 -s ours

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

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



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