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

Merge "[automerger skipped] [CDM] Validate component name length before requesting notification access. am: 447216ec -s ours am: 341969c1 -s ours am: 1cdde05c -s ours am: 7f6c7fa6 -s ours am: 91b7ddd5 -s ours am: 44021887 -s ours am: 3e968b7c -s ours am: 8f33f06f -s ours am: 3753147c -s ours am: 88347494 -s ours" into udc-qpr-dev-plus-aosp