Merge "Mark shade as opaque when scrims are visible" into sc-dev am: 21a24b06 am: 8125ad17 am: 03cce500

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

Change-Id: Iaa9188a976a349b2be57910074f320c38f4dc6b7