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: 01b9b68d am: 729916bc

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



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