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

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

Change-Id: I10b003bfec45fc6d4bbd55cf9fd9fa9c4290e2f9