Merge "Fix scrims not fading in" into tm-dev am: 41e1c4680c am: 4c9be8ef0d
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17976322 Change-Id: I936a829673a40833255a02315ce818d5c74536fe Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: