[automerger skipped] [conflict] Merge "[Scrim] Remove notif scrim flicker on unlock" into tm-dev am: a20c177e am: 7690bc4d -s ours

am skip reason: Merged-In I0cfa7cd40b69c5c9ea7eeb708f1a073f307918cb with SHA-1 99b958d5 is already in history

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



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