Merge "Clear listeners after animation" into tm-qpr-dev am: 7c08dcb5a9 am: 0513d5fa90

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

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