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

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



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