[automerger skipped] Merge "Defer deleteKey in KeyStorage in Checkpointing mode" am: fc4ad04ffe
am: 288fca9266
-s ours am: 5890c72489
-s ours
am:gugelfrei911454093c
-s ours am skip reason: change_id Ie5fc2d098355e2d095c53e9a95a6a8c7ab7ed051 with SHA18cc5716ef1
is in history Change-Id: I4da8f18eb43523455b860a08b689f84c535b66c9
commit
0eab873852