Merge "Mark shade as opaque when scrims are visible" into sc-dev am: 21a24b06 am: 7a2dd1ae

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

Change-Id: Ib675547bc833c099aa2fa29f87ad1eeb940da161