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

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



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