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: I979e47844cd9c2e931ece2f4b5bc969b70735b4c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>