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

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



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