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

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

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



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