Merge "Fixes Smartspace jumps issue during unlock animation" into udc-qpr-dev am: bbdf8cfe

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



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