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