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

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

Change-Id: I6d597ccf64d839d24ab1ef72f2d2d3ad5719f51b