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

[automerger skipped] Merge "Fix some memory leakage" into udc-dev am: 2f74eeed am: f4d6bd01 am: db554318 -s ours am: 2b84c252 -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: I28738b3971bb76c8277c92a67b92fbf8a656c7e7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>