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

am skip reason: skipped by user enh

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I3bede083b3d0e162e0ecc0d782850332fabfffdd