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

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

Change-Id: I62102ed324ab2cec3987af7a961cab303c705856