[automerger skipped] Fix storaged memory leak am: abed883043 -s ours am: a0be2d8673 -s ours am: 5497c49d4d -s ours am: ec3d03a5d5 -s ours am: 02c7347fde -s ours am: 8d075664fc -s ours

am skip reason: skipped by user enh

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

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