Merge "Fix some memory leakage" am: d52e734a am: 2749aef8

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



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