Merge "Fix scrims not fading in" into tm-dev am: 41e1c468 am: 4c9be8ef am:...

Merge "Fix scrims not fading in" into tm-dev am: 41e1c468 am: 4c9be8ef am: 25e496ff am: f791da92

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



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