Merge "Fix "Attempt to delete released memory" warning." am: 0a5c0b43 am:...

Merge "Fix "Attempt to delete released memory" warning." am: 0a5c0b43 am: 9fdeef70 am: 47d5e684

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



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