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

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

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

Change-Id: Ib675a8f73363be14bf8723b5f9a2eb325989884c