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 am: 4f0fcf32

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



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