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

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



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