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

Change-Id: Ia9452550722754e89ef969bab7e7bd6cd229a50c