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: d34d8c79 am: c56fad3e am: 7afcc428

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



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