[automerger skipped] Merge "Fix Notification animation controller memory leak"...

[automerger skipped] Merge "Fix Notification animation controller memory leak" into udc-qpr-dev am: 010f0da5 am: 3d697fc0 -s ours

am skip reason: Merged-In Ib17577cba17ed35b24c4ab32ce0ed55fc7a24605 with SHA-1 0e46bbbd is already in history

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



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