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

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



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