Merge "Remove NotifBlockingHelperManager" into tm-qpr-dev am: afa71b9a am: fae61455

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



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