Merge "Fix KeyStoreClientImpl::doesKeyExist to return correct result" am: 8ba1cb3268
am: 7017d49cb9

Change-Id: I3b41da12ec0b21050a963eedafe2a053f7b7e7ea