Merge "Update notification blocking ui theming" into sc-dev am: d6f7eb33 am: 3ebf8ce0 am: 955f089c

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

Change-Id: Ib34f2fceda5a8c89bb25a32fddbceb3523056620