[automerger skipped] Merge "Fixes two bright flashes of the notification scrim" into sc-dev am: 54a6622179 am: 34f9f5814b -s ours am: c959988b65 -s ours
am skip reason: Merged-In I418e878698c2606856b93faf774cd87830773815 with SHA-1 ddefd45358 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15638438
Change-Id: I6d5533d967b6386a691bc13fd33a67e2c918511b
This commit is contained in: