Merge "Fix some memory leakage" into udc-dev am: 2f74eeed

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



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