[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: 34f9f581 -s ours am: c959988b -s ours am: a1fdc8fa -s ours

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

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

Change-Id: I845a98e8ffa24b98d2e9dc51259a205e594f5e72