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

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



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