[automerger skipped] Merge "Fixes two bright flashes of the notification...

[automerger skipped] Merge "Fixes two bright flashes of the notification scrim" into sc-dev am: 54a66221 am: c1467b6f am: ca6d7ce9 -s ours am: 39657fbb -s ours

am skip reason: Merged-In I418e878698c2606856b93faf774cd87830773815 with SHA-1 ee48cd09 is already in history

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

Change-Id: I01ebf0dc7aaf0b6b04d693596e267cc7c4de9ec1