Merge "Large screens: fully fade in behind scrim before anything else on shade" into tm-qpr-dev am: 14fdb4b9be am: 6a3ead3272

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

Change-Id: I0fb2cbadf3433c9f58faafffc57cadb9b20e901c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>