Merge "Fix lock screen overlap test." into tm-qpr-dev am: f0ed9f3d

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



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