[automerger skipped] Merge "[Notification] Fix Notification channel Dnd bypass for multiusers" into sc-dev am: aad3a861 -s ours

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

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

Change-Id: I95e88be889ae709fd6037049022c874029b93906