[automerger skipped] Fix memory leak in keystore am: 0a62361d9f -s ours am: 8216050ff8 -s ours
am skip reason: Change-Id I3a25aa67f121832640848a38398c523e20a2c6df with SHA-1 8c4c1d6efb is in history

Change-Id: I393c8d85caa5cc45f4d83232598bfe3abdb5016e