Merge "Update notification blocking ui theming" into sc-dev am: d6f7eb33 am: 867454e7

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

Change-Id: I0bedbe02e8b2067792e833ad6827a769865452af