Merge "Allow users to block notification channels" into tm-dev am: 73871cad am: c358abc8 am: d49bcaf9

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



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