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

Change-Id: Ia3226d3aa15767f2fb883335a6cc98b7080d7420