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

Merge "[automerger skipped] [CDM] Validate component name length before requesting notification access. am: edb1e78e -s ours am: 98ef6acc -s ours am: 0970abe3 -s ours am: 0246f993 -s ours am: da091d75 -s ours am: bb78c231 -s ours am: ad5236f0 -s ours am: 05508357 -s ours am: a2091d90 -s ours" into udc-qpr-dev-plus-aosp