Merge "[automerger skipped] Limit the size of NotificationChannel and...

Merge "[automerger skipped] Limit the size of NotificationChannel and NotificationChannelGroup am: c2d26498 am: f1c5754b -s ours am: 7d9c55fd -s ours am: a85f1fe5 -s ours am: bf77efaa -s ours am: fbe0eddf -s ours am: fc8fd15e -s ours am: b0fa4613 -s ours am: e9d22423 -s ours" into tm-d1-dev-plus-aosp