Merge "Fix potential memory leaks" am: 48cd4132 am: 128a4dbc am: f8c14974

Original change: https://android-review.googlesource.com/c/platform/system/core/+/2322216



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