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

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



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