[automerger skipped] [Notification] Fix Notification channel Dnd bypass for...

[automerger skipped] [Notification] Fix Notification channel Dnd bypass for multiusers am: 92a9f5fc am: 1b42ecc1 am: 17869bc1 -s ours am: e09e7f6d -s ours

am skip reason: skip tag Change-Id Ia26467f27b31bc048bdb141beac7d764fcb27f51 with SHA-1 51cf6512 is already in history

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

Change-Id: I2676593a0523954271af6ad42397dc53d1f5b166