Merge "[automerger skipped] Limit the size of NotificationChannel and NotificationChannelGroup am: c2d264989a am: f1c5754b97 -s ours am: 7d9c55fd15 -s ours am: a85f1fe58d -s ours am: bf77efaa37 -s ours am: fbe0eddf01 -s ours am: fc8fd15e92 -s ours am: b0fa4613e5 -s ours am: e9d2242359 -s ours" into tm-d1-dev-plus-aosp