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

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

Change-Id: I46ba9fa3ab89dc957a4d1726578a5dc95028f3a4