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

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



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