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

Change-Id: I28c08fa792f9514a0d28cb20f6f8763c9bab411f