Merge "[Scrim] Remove notif scrim flicker on unlock" into tm-dev am: a20c177e am: 371aba78

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



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