Merge "Fixed an issue where the top edge flickered" into sc-dev am: 4f0d02b4 am: 67f04ed8

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

Change-Id: Ia2998c0465560f4a200e91bbdfdebbc9b1d365f8