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

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

Change-Id: I8fba7bba7029628456b30091194b2eabfd9ecbda