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

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



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