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

[automerger skipped] Merge "[DO NOT MERGE] Fix Memory Leak: Part II of rewrite render info callback" into udc-dev am: ef163c02 am: 33acbbe4 am: 0e92ca58 am: d53fd54b -s ours

am skip reason: subject contains skip directive

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



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