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

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

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



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