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

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



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