[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: 9a84038f am: 51737142 am: d7348546 -s ours

am skip reason: subject contains skip directive

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



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