[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: 44df92a6 -s ours am: d4513c03 -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: I062a24e84e0590356f18d6444bbb864214021ee7