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 am: 3b80917d

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

Change-Id: I763331b7dff871a5008822d39b2abafad3e1980b