Merge "Fix "Attempt to delete released memory" warning." am: 0a5c0b4364 am: 9fdeef7052

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

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