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

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



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