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

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



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