Merge "Fix issue where scrim would be transparent" into sc-qpr1-dev am: 48647682 am: af936c0c

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

Change-Id: Id5fabe2f2f378c5dd3ec7d3b643d349440685a9e