Merge "[DO NOT MERGE] Fix Memory Leak: Part II of rewrite render info...

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

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



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