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: Iff9a7e40db36f7916f68d7572c14e2c27a0e29fe