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

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

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



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