Get rid of manually generated IKeystoreService in wifi/keystore

The change included necessary updates to wifi/keystore caused by changes
in interface signature.

Test: none
Bug:68389643
Change-Id: I307f0131d05e8d708c12f8a9ce48beb689d96b72
2 files changed