Merge "Fix scrims not fading in" into tm-dev am: 41e1c468 am: 8eeb3930

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



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