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

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

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



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