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

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

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

Change-Id: Ib3225b9d13d68881e4d2a648e373b596fb9f19c8