Merge "Fix issue where scrim would be transparent" into sc-qpr1-dev am: 48647682a0 am: af936c0ce1 am: 923be59249

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

Change-Id: I35c34a892972287180fb14fcfcbcdea21b4818e6