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

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

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



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