Merge "Fixed an issue where the notification clipping flickered" into sc-dev am: 1a10b25d am: 188f892e am: 442d2842

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

Change-Id: I9fd03e25b41af4837f84759285db872c6a619cc1