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

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

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