Merge "Reset NSSL translationY after a transision gets cancelled" into tm-qpr-dev am: 3da25af6

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



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