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

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



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