Merge "Merge "Show system notifications when DnD is enabled" into tm-dev am:...

Merge "Merge "Show system notifications when DnD is enabled" into tm-dev am: ab13fd85 am: eb449d2c" into tm-d1-dev-plus-aosp am: bb4b9ddc am: c31de6f8

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



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