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

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



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