Merge changes from topic "stop-leaked-animators" into tm-dev am: a4ac1574

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



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