Merge "Always use light reveal scrim" into sc-qpr1-dev am: d31ee841 am: 845fed6a

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

Change-Id: I04e754cc04a7b2244f29427f9827c844b3fcf4c3