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

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



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