[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: 09499019 -s ours

am skip reason: subject contains skip directive

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



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