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

[automerger skipped] Merge "[DO NOT MERGE] Fix Memory Leak: Part I of Rewrite render info remote callback." into udc-dev am: b33ec254 am: e7c017c1 am: 22e2b9ec am: 9a8de72d -s ours

am skip reason: subject contains skip directive

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



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