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

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



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