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