[automerger skipped] [DO NOT MERGE] Fix Memory Leak: Part II of rewrite render info callback am: e22573d1 am: f3652561 am: 3d91ee80 am: 2cc8bcf0 -s ours

am skip reason: subject contains skip directive

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



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