[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: ec3d03a5 -s ours

am skip reason: skipped by user enh

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



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