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

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



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