Merge "Always use light reveal scrim" into sc-qpr1-dev am: d31ee841 am: 0a49cc54 am: a3bfc853

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

Change-Id: I3eef5e8b980bb269d62463fdd539f79ea8670780