Merge "Merge "Fix memory leak with RenderNodeAnimator" into tm-dev am: b9a8ed8b am: b27c97ac" into tm-d1-dev-plus-aosp am: 239f1ada

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



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