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

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



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