Merge "Fix issue where scrim would be transparent" into sc-qpr1-dev am: 48647682a0 am: ef35ff2146 am: 27458498aa

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

Change-Id: I32427ed876f135c9d0b6069a25da4222a987fe93