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

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



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