Merge "Fix blocked notifications screen" into rvc-dev am: 1528d932ed am: 367aeee6b8

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11808483

Change-Id: I9ba51ea22f1551b79709c0de38230981920159df