[automerger skipped] Fix storaged memory leak am: f0429769 -s ours am: 76f158b2 am: 127b9b10 am: 8b94e79c am: 72a46bab

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

Change-Id: Iad8e211d0e7132f0d63e3cb6c9fbcecd07668251