Merge changes Ib89eb3c6,I077d716c into main

* changes:
  [SB][Wifi] Don't expose WifiRepositoryImpl.selectedUserContext.
  [SB][Wifi] Small cleanups of WifiRepositoryImplTest.