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: cd25d68c am: f2010fff

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

Change-Id: Ic53a6a5540b2d4f5a239a32850a102b90000c159