Merge "Fixes Smartspace jumps issue during unlock animation" into udc-dev am: 66b0e8ad

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



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