Merge changes Idb3905ce,I5111a20a into main

* changes:
  Add unit tests for WifiKeystore.
  Move getLegacyKeystore to the WifiBlobStore class.