Merge "Reset NSSL translationY after a transision gets cancelled" into...

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

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



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