Merge "[DO NOT MERGE] Fix Memory Leak: Part II of rewrite render info callback" into udc-dev am: ef163c02

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



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