[automerger skipped] Fix storaged memory leak am: f0429769 -s ours am: 76f158b2

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

Change-Id: I71a4eeaeffeca317c4076ca2d04d9c973a2ff6f3