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

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

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

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



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