[automerger skipped] Merge "Fix some memory leakage" into udc-dev am:...

[automerger skipped] Merge "Fix some memory leakage" into udc-dev am: 2f74eeed am: ad7ec796 -s ours

am skip reason: Merged-In I751beaeba39eeabd2c6aa9059b51997130dbf86b with SHA-1 71d62f25 is already in history

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



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