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

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



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