Merge "Fixes two bright flashes of the notification scrim" into sc-dev am: 54a66221

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

Change-Id: I32eee3bec00349fa6ebcec18020df9f7313dc711