[automerger skipped] Fix KeyStoreClientImpl::doesKeyExist to return correct result am: cb77797d66 -s ours
am: eb07df9764 -s ours
am skip reason: change_id Iffc2e155a61354f1fbffbece093b19e5cbc537fd with SHA1 1a87fdc2fa is in history

Change-Id: I3a99ae0181558bddcde270b0becd118301e14430