[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: I084c66b3eb54b52e6ab1f663ecb54e8daedb2c7e