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: I673bd7fb339d94132995cd59d370a1b8d35ae5aa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>