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

[automerger skipped] Fix storaged memory leak am: 8ec2afb9 -s ours am: dc272253 -s ours am: 7cc62420 -s ours am: 0a2cdd6a -s ours am: 0430f1b3 -s ours am: 4fab8685 -s ours

am skip reason: skipped by user alexaspradlin

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



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