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 am: 1beef5bf

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



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