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

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

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

Change-Id: Ieafb6f8332492c6d7533e9b7084fd668b40ae5de