[automerger skipped] Fix memory leak in keystore am: 85735d8693 -s ours am: 7319817260 -s ours
am skip reason: Change-Id I90d4dc9d4510f4ac250022c89240a742b9e8d4b4 with SHA-1 bec89993a9 is in history

Change-Id: Id199de4ca9bb656974eaf028f314c3af0373d347