[automerger skipped] Fix storaged memory leak am: abed8830 -s ours am:...

[automerger skipped] Fix storaged memory leak am: abed8830 -s ours am: a0be2d86 -s ours am: 5497c49d -s ours

am skip reason: skipped by user enh

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



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