Merge "[DO NOT MERGE] Fix Memory Leak: Part I of Rewrite render info remote callback." into udc-dev am: b33ec254 am: 41eb7a2b am: 6879e4ec

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



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