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: 33acbbe4

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



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