Merge "Fix calculation of areChannelsBypassingDnd" into udc-qpr-dev am: 9835dcf1eb

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

Change-Id: I716f5a1afc949e1825b8917d8e4b491cb63c1a72
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>