Merge "Fixed an issue where the notification clipping flickered" into sc-dev...

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

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

Change-Id: I5c6d1aaa628f6f6f7d8a0a2c9d4765647afa7835