Merge "Fix white line before shelf on lockscreen" into tm-dev am: 565c12dd am: f5731cd6 am: e2754e93

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



Change-Id: I81ba4dd921b1e06df1b14fb0771b05524cf2ffd0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>