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

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

Change-Id: If39af3d4a56994b0794e100d241212c7a4bba56e