Merge "Always use light reveal scrim" into sc-qpr1-dev am: d31ee841c0

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

Change-Id: Ic7a84b0c41a081b78d2dd6712dcb422c94450360