Merge "Fixed an issue where the notification scrim could become transparent"...

Merge "Fixed an issue where the notification scrim could become transparent" into sc-dev am: f7477f8f

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

Change-Id: Id9e3ec6b44b39c89530ea5122e72461686fb90e4