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

Change-Id: Ie3aa3ab3e7b4688a3ed1619a5bdb562017c3148f