Merge "Add WifiKeystore to allow Wifi framework access legacykeystore"