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

am skip reason: skipped by user jpawlowski

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

Change-Id: Ie54114d4e6d220dd5bf548bb5364ecdee5a5c21f