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

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



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