[automerger skipped] Fix some memory leakage am: 71d62f25 -s ours am: 882e2ca8 -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: I3d07d535519e5e36bea742c3d001757fa13e2e33
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>